Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(batch): Support log iter batch for table or mv #16487

Merged
merged 10 commits into from
Apr 28, 2024
Merged

Conversation

xxhZs
Copy link
Contributor

@xxhZs xxhZs commented Apr 25, 2024

I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.

What's changed and what's your intention?

We support batch calling the iter_log interface to query the log of a certain mv or table

Checklist

  • I have written necessary rustdoc comments
  • I have added necessary unit tests and integration tests
  • I have added test labels as necessary. See details.
  • I have added fuzzing tests or opened an issue to track them. (Optional, recommended for new SQL features Sqlsmith: Sql feature generation #7934).
  • My PR contains breaking changes. (If it deprecates some features, please create a tracking issue to remove them in the future).
  • All checks passed in ./risedev check (or alias, ./risedev c)
  • My PR changes performance-critical code. (Please run macro/micro-benchmarks and show the results.)
  • My PR contains critical fixes that are necessary to be merged into the latest release. (Please check out the details)

Documentation

  • My PR needs documentation updates. (Please use the Release note section below to summarize the impact on users)

Release note

If this PR includes changes that directly affect users or other significant modifications relevant to the community, kindly draft a release note to provide a concise summary of these changes. Please prioritize highlighting the impact these changes will have on users.

@xxhZs xxhZs changed the title feat(batch) support log iter batch for table or mv feat(batch): Support log iter batch for table or mv Apr 25, 2024
fmt

fmt

fmt
@xxhZs xxhZs force-pushed the xxh/support-log-iter branch from 0590804 to da9d45d Compare April 25, 2024 05:43
@xxhZs xxhZs requested review from chenzl25, wenym1 and hzxa21 April 25, 2024 05:43
fix
src/sqlparser/src/ast/query.rs Outdated Show resolved Hide resolved
src/storage/src/table/batch_table/storage_table.rs Outdated Show resolved Hide resolved
proto/batch_plan.proto Show resolved Hide resolved
src/frontend/src/optimizer/plan_node/generic/log_scan.rs Outdated Show resolved Hide resolved
src/frontend/src/optimizer/plan_node/batch_log_seq_scan.rs Outdated Show resolved Hide resolved
src/frontend/src/optimizer/plan_node/generic/log_scan.rs Outdated Show resolved Hide resolved
src/common/src/catalog/column.rs Outdated Show resolved Hide resolved
src/frontend/src/binder/relation/table_or_source.rs Outdated Show resolved Hide resolved
src/batch/src/executor/log_row_seq_scan.rs Show resolved Hide resolved
fix

fix
@xxhZs xxhZs force-pushed the xxh/support-log-iter branch from ef42385 to 11fd241 Compare April 28, 2024 06:29
Copy link
Contributor

@wenym1 wenym1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rest LGTM!

src/batch/src/executor/log_row_seq_scan.rs Outdated Show resolved Hide resolved
src/batch/src/executor/log_row_seq_scan.rs Outdated Show resolved Hide resolved
src/batch/src/executor/log_row_seq_scan.rs Outdated Show resolved Hide resolved
}
Err(e) => Err(e),
});
let chunk = collect_data_chunk(&mut iter, &schema, Some(chunk_size))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to do it in a loop. Currently if there is more than chunk_size rows in iter, we will only collect the first chunk_size rows.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you referring to the loop above, or is it a nested loop

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops. I thought the iter is created inside the loop. So now we won't miss any rows.

nits: we can do iter.map(|r| { ... }) before the pin_mut, so that we don't have to recreate the map stream in every iteration.

src/frontend/src/optimizer/plan_node/generic/log_scan.rs Outdated Show resolved Hide resolved
src/frontend/src/optimizer/plan_node/generic/log_scan.rs Outdated Show resolved Hide resolved
src/storage/src/table/batch_table/storage_table.rs Outdated Show resolved Hide resolved
src/storage/src/table/batch_table/storage_table.rs Outdated Show resolved Hide resolved
src/storage/src/table/batch_table/storage_table.rs Outdated Show resolved Hide resolved
Copy link
Contributor

@wenym1 wenym1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rest LGTM! Thanks for the great work!

}
Err(e) => Err(e),
});
let chunk = collect_data_chunk(&mut iter, &schema, Some(chunk_size))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops. I thought the iter is created inside the loop. So now we won't miss any rows.

nits: we can do iter.map(|r| { ... }) before the pin_mut, so that we don't have to recreate the map stream in every iteration.

src/batch/src/executor/log_row_seq_scan.rs Outdated Show resolved Hide resolved
fmt
@xxhZs xxhZs force-pushed the xxh/support-log-iter branch from f8fe040 to e430e7f Compare April 28, 2024 14:59
@xxhZs xxhZs enabled auto-merge April 28, 2024 15:25
@xxhZs xxhZs added this pull request to the merge queue Apr 28, 2024
Merged via the queue into main with commit 82d847c Apr 28, 2024
30 of 31 checks passed
@xxhZs xxhZs deleted the xxh/support-log-iter branch April 28, 2024 15:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants